Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 27 May 2010 11:59:21 +0000 (11:59 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 27 May 2010 11:59:21 +0000 (11:59 +0000)

Trivial merge